Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

shardddl: return error if conflict happened when receive conflict detect operation (#9263) #9267

Merged
merged 4 commits into from
Jun 21, 2023
Merged

shardddl: return error if conflict happened when receive conflict detect operation (#9263) #9267

merged 4 commits into from
Jun 21, 2023

Conversation

ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Jun 20, 2023 •
edited by GMHDBJD
Loading

This is an automated cherry-pick of #9263

What problem does this PR solve?

Issue Number: close #9280

What is changed and how it works?

  • return error for conflict detect operation

Check List

Tests

  • Integration test
  • Manual test (add detailed scripts or steps below)

Questions

Will it cause performance regression or break compatibility?
Do you need to update user documentation, design documentation or monitoring documentation?

Release note 

Please refer to [Release Notes Language Style Guide](https://pingcap.github.io/tidb-dev-guide/contribute-to-tidb/release-notes-style-guide.html) to write a quality release note.

If you don't think this PR needs a release note then fill it with `None`.

@ti-chi-bot ti-chi-bot mentioned this pull request Jun 20, 2023
Merged
@ti-chi-bot ti-chi-bot added lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-7.2 This PR is cherry-picked to release-7.2 from a source PR. labels Jun 20, 2023
@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jun 20, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 21, 2023
@GMHDBJD
Copy link
Contributor

GMHDBJD commented Jun 21, 2023

/merge

1 similar comment
@GMHDBJD
Copy link
Contributor

GMHDBJD commented Jun 21, 2023

/merge

@GMHDBJD
Copy link
Contributor

GMHDBJD commented Jun 21, 2023

/approve

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jun 21, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: GMHDBJD

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label Jun 21, 2023
@GMHDBJD
Copy link
Contributor

GMHDBJD commented Jun 21, 2023

/retest

@wuhuizuo wuhuizuo mentioned this pull request Jun 21, 2023
Closed
@ti-chi-bot ti-chi-bot bot merged commit 33e21a7 into pingcap:release-7.2 Jun 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@GMHDBJD GMHDBJD

Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-7.2 This PR is cherry-picked to release-7.2 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ti-chi-bot @GMHDBJD